Deprecate Spree::Payment offsets
#5008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
changelog:solidus_core
kennyadsl
reviewed
Apr 11, 2023
waiting-for-dev
force-pushed
the
waiting-for-dev/remove_offsets
branch
from
66b3652 to
83f1dc6
Compare
waiting-for-dev
changed the title
Spree::Payment#offsetsSpree::Payment offsets
waiting-for-dev
force-pushed
the
waiting-for-dev/remove_offsets
branch
from
83f1dc6 to
32f5fae
Compare
kennyadsl
approved these changes
Apr 12, 2023
| @@ -101,7 +111,10 @@ def offsets_total | |||
| # @return [BigDecimal] the amount of this payment minus the offsets | |||
| # (old-style refunds) and refunds | |||
| def credit_allowed | |||
| amount - (offsets_total.abs + refunds.sum(:amount)) | |||
| amount - ( | |||
| (self.class.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed' AND source_id = ?", id).sum(:amount)).abs + | |||
There was a problem hiding this comment.
In this case, maybe a variable makes sense? We could add a comment to easily recall which part of the method we need to remove when offset_payment will be gone.
There was a problem hiding this comment.
Given that I needed to repeat the inline on Spree::Order#has_non_reimbursement_related_refunds?, and that the code should really be very short-lived (we should remove it in #4989), I'd prefer to keep it simple if you think it's ok 🙂
There was a problem hiding this comment.
I had the same suggestion as alberto, but also fine with this give its expected short life
The old system for refunds was removed in 2014 [1]. We deprecate the `.offset_payment` scope, which is in turn used by the `.offsets` association. We inline its usage on a couple of methods until we perform the full removal. [1] - spree/spree#4883
waiting-for-dev
force-pushed
the
waiting-for-dev/remove_offsets
branch
from
32f5fae to
03ae9a2
Compare
elia
approved these changes
Apr 13, 2023
| @@ -101,7 +111,10 @@ def offsets_total | |||
| # @return [BigDecimal] the amount of this payment minus the offsets | |||
| # (old-style refunds) and refunds | |||
| def credit_allowed | |||
| amount - (offsets_total.abs + refunds.sum(:amount)) | |||
| amount - ( | |||
| (self.class.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed' AND source_id = ?", id).sum(:amount)).abs + | |||
There was a problem hiding this comment.
I had the same suggestion as alberto, but also fine with this give its expected short life
kennyadsl
added a commit
to nebulab/solidus
that referenced
this pull request
Apr 14, 2023
This was a leftover for a feature that has been removed long time ago. Please use Refunds now. Ref solidusio#5008
kennyadsl
added a commit
to nebulab/solidus
that referenced
this pull request
Apr 18, 2023
This was a leftover for a feature that has been removed long time ago. Please use Refunds now. Ref solidusio#5008
kennyadsl
added a commit
to nebulab/solidus
that referenced
this pull request
Apr 18, 2023
This was a leftover for a feature that has been removed long time ago. Please use Refunds now. Ref solidusio#5008
kennyadsl
added a commit
to nebulab/solidus
that referenced
this pull request
Apr 19, 2023
This was a leftover for a feature that has been removed long time ago. Please use Refunds now. Ref solidusio#5008
kennyadsl
added a commit
to nebulab/solidus
that referenced
this pull request
Apr 24, 2023
This was a leftover for a feature that has been removed long time ago. Please use Refunds now. Ref solidusio#5008
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The old system for refunds was removed in 2014.
We deprecate the
.offset_paymentscope, which is in turn used by the.offsetsassociation. We inline its usage on a couple of methods until we perform the full removal.Checklist
Check out our PR guidelines for more details.
The following are mandatory for all PRs:
The following are not always needed: